From: Samuel Thibault Date: Wed, 2 Apr 2025 18:01:07 +0000 (+0200) Subject: gcc-15 X-Git-Tag: archive/raspbian/1.4.10+dfsg-2+rpi1^2^2~2 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=aaa66b38930aa70174e194a4e23ea9378b7d355a;p=starpu.git gcc-15 commit d84ec987d14c0e387d8e9fcd97171b0e7bd65f5b Author: Samuel Thibault Date: Sat Dec 21 10:05:03 2024 +0100 Fix missing function parameters (cherry picked from commit a6224ae7ba4016e2dc2adf57ef07d0befd27ef92) Gbp-Pq: Name gcc-15 --- diff --git a/mpi/src/load_balancer/policy/load_balancer_policy.h b/mpi/src/load_balancer/policy/load_balancer_policy.h index 8dbdac1..f502f61 100644 --- a/mpi/src/load_balancer/policy/load_balancer_policy.h +++ b/mpi/src/load_balancer/policy/load_balancer_policy.h @@ -35,8 +35,8 @@ struct load_balancer_policy { int (*init)(struct starpu_mpi_lb_conf *); int (*deinit)(); - void (*submitted_task_entry_point)(); - void (*finished_task_entry_point)(); + void (*submitted_task_entry_point)(struct starpu_task *task); + void (*finished_task_entry_point)(void); /** Name of the load balancing policy. The selection of the load balancer is * performed through the use of the STARPU_MPI_LB=name environment diff --git a/mpi/src/load_balancer/policy/load_heat_propagation.c b/mpi/src/load_balancer/policy/load_heat_propagation.c index 91686bf..64ac4f4 100644 --- a/mpi/src/load_balancer/policy/load_heat_propagation.c +++ b/mpi/src/load_balancer/policy/load_heat_propagation.c @@ -401,7 +401,7 @@ static void submitted_task_heat(struct starpu_task *task) } } -static void finished_task_heat() +static void finished_task_heat(void) { //fprintf(stderr,"Try to decrement nsubmitted_tasks..."); STARPU_PTHREAD_MUTEX_LOCK(&load_data_mutex); diff --git a/mpi/src/starpu_mpi_cache.c b/mpi/src/starpu_mpi_cache.c index d286280..d1d48dd 100644 --- a/mpi/src/starpu_mpi_cache.c +++ b/mpi/src/starpu_mpi_cache.c @@ -82,7 +82,7 @@ void _starpu_mpi_cache_init(MPI_Comm comm) STARPU_PTHREAD_MUTEX_INIT(&_cache_mutex, NULL); } -void _starpu_mpi_cache_shutdown() +void _starpu_mpi_cache_shutdown(void) { if (_starpu_cache_enabled == 0) return; diff --git a/mpi/src/starpu_mpi_cache.h b/mpi/src/starpu_mpi_cache.h index f2cd967..7c2fa2a 100644 --- a/mpi/src/starpu_mpi_cache.h +++ b/mpi/src/starpu_mpi_cache.h @@ -30,7 +30,7 @@ extern "C" extern int _starpu_cache_enabled; void _starpu_mpi_cache_init(MPI_Comm comm); -void _starpu_mpi_cache_shutdown(); +void _starpu_mpi_cache_shutdown(void); void _starpu_mpi_cache_data_init(starpu_data_handle_t data_handle); void _starpu_mpi_cache_data_clear(starpu_data_handle_t data_handle); diff --git a/mpi/src/starpu_mpi_init.c b/mpi/src/starpu_mpi_init.c index 81d4c04..ca145fe 100644 --- a/mpi/src/starpu_mpi_init.c +++ b/mpi/src/starpu_mpi_init.c @@ -358,7 +358,7 @@ int starpu_mpi_shutdown_comm(MPI_Comm comm) _starpu_mpi_comm_amounts_display(stderr, rank); _starpu_mpi_comm_amounts_shutdown(); - _starpu_mpi_cache_shutdown(world_size); + _starpu_mpi_cache_shutdown(); _mpi_backend._starpu_mpi_backend_shutdown(); diff --git a/socl/src/cl_enqueuendrangekernel.c b/socl/src/cl_enqueuendrangekernel.c index 9a5d137..7831868 100644 --- a/socl/src/cl_enqueuendrangekernel.c +++ b/socl/src/cl_enqueuendrangekernel.c @@ -96,7 +96,7 @@ void soclEnqueueNDRangeKernel_task(void *descr[], void *args) */ cl_int command_ndrange_kernel_submit(command_ndrange_kernel cmd) { - starpu_task task = task_create(); + starpu_task task = task_create(CL_COMMAND_NDRANGE_KERNEL); task->cl = &cmd->codelet; task->cl->model = cmd->kernel->perfmodel; task->cl_arg = cmd; diff --git a/socl/src/task.c b/socl/src/task.c index 97f94df..81ef6ca 100644 --- a/socl/src/task.c +++ b/socl/src/task.c @@ -51,7 +51,7 @@ void command_completed_task_callback(void *arg) /* * Create a StarPU task */ -starpu_task task_create() +starpu_task task_create(cl_command_type typ) { struct starpu_task * task; @@ -163,7 +163,7 @@ void cpu_task_submit_ex(cl_command cmd, void (*callback)(void*), void *arg, int codelet->where = STARPU_OPENCL | STARPU_CPU | STARPU_CUDA; - starpu_task task = task_create(); + starpu_task task = task_create(CL_COMMAND_TASK); if (num_events != 0) { task_depends_on(task, num_events, events); diff --git a/socl/src/task.h b/socl/src/task.h index 078cc4b..37ff1c9 100644 --- a/socl/src/task.h +++ b/socl/src/task.h @@ -19,7 +19,7 @@ #include "socl.h" -starpu_task task_create() STARPU_ATTRIBUTE_MALLOC; +starpu_task task_create(cl_command_type typ) STARPU_ATTRIBUTE_MALLOC; void task_dependency_add(starpu_task task, cl_uint num_events, cl_event *events); void command_completed(cl_command cmd); diff --git a/src/drivers/tcpip/driver_tcpip_common.c b/src/drivers/tcpip/driver_tcpip_common.c index aae58e1..3240fa2 100644 --- a/src/drivers/tcpip/driver_tcpip_common.c +++ b/src/drivers/tcpip/driver_tcpip_common.c @@ -155,7 +155,7 @@ struct _starpu_tcpip_req_pending }; //function thread -static void * _starpu_tcpip_thread_pending() +static void * _starpu_tcpip_thread_pending(void *foo STARPU_ATTRIBUTE_UNUSED) { fd_set reads; fd_set writes; diff --git a/src/profiling/callbacks.c b/src/profiling/callbacks.c index 48c8bb4..b4670d1 100644 --- a/src/profiling/callbacks.c +++ b/src/profiling/callbacks.c @@ -36,7 +36,7 @@ static void *lib_handle=NULL; /** Dummy implementations of the callbacks */ -void _starpu_prof_tool_event_dummy_func() +static void _starpu_prof_tool_event_dummy_func(struct starpu_prof_tool_info *pti, union starpu_prof_tool_event_info *ptei, struct starpu_prof_tool_api_info *ptai) { }